Bug fixes and improvements (aka I forgot)
Merge pull request #30 from drberry85/master

Bug fixes and improvements (aka I forgot)