Added more changes
Merge pull request #7 from ecephas/master

Added more changes