Merge branch 'theantway-master'
tag 0.2.7