Merge pull request #207 from sbliven/master

Merge with sbliven