Merge pull request #1 from harmonator/Fixes

Fixes
Update 11/14/2014