LB-142
Merge pull request #5 from dhanuka84/master

LB-142 and LB-95 resolved in this merge