Merge pull request #2 from zinnschlag/master

Updating fork
Issue 912, making branch
Solving Issue912