Bug Fix: https://www.pivotaltracker.com/story/show/66468534
Merge pull request #92 from jateeter/master

Bug Fix: https://www.pivotaltracker.com/story/show/66468534