Committed missed changes
Merge pull request #18 from skpcharles/master

Committed missed changes