Updated for issue #1213
Merge pull request #9 from hintjens/master

Updated for issue #1213