Review - EAGLE-81 and EAGLE-95

[Krishna, Murali(AWF)]

Hi Team,

Would like your review for,

https://issues.apache.org/jira/browse/EAGLE-81 (PR - 
https://github.com/apache/incubator-eagle/pull/76)
https://issues.apache.org/jira/browse/EAGLE-95 (PR - 
https://github.com/apache/incubator-eagle/pull/71)

Thanks,
Murali Krishna