Some changes
Merge pull request #4 from MikeKPI/master

Some changes