Merge pull request #28 from left23/master

2x commits - see comments