#2 Some changes
Merge pull request #12 from ForceMan88/master

#2 Some changes