Merge pull request #78 from nromanen/master

Some changes