Closes #47 Thanks to Zhelyazkov

Closes #47 Thanks to Zhelyazkov