resolved issue#5 and issue #6 not needed in first release
Merge pull request #17 from Yourinspiration/issue#5

resolved issue#5 and issue #6 not needed in first release