some work
Merge pull request #20 from anitsan/working/19