bug fix: https://www.pivotaltracker.com/story/show/66715482
Merge pull request #85 from jateeter/master

bug fix: https://www.pivotaltracker.com/story/show/66715482