done some to dos
Merge pull request #71 from asankasanjaya/master

done some to dos