Merge pull request #68 from senkin/master

More fixes/changes