Merge pull request #9 from allmywant/master

For #4 ,#8 issue and prioritized work #4