fixed #20
fixed #5
Merge pull request #28 from colemancda/master

merge master into experimental branch