Revert "Merge pull request #4 from narliss/develop-11"

This reverts commit a680ba9b1e64bfdc509c2ec503b05d867d0b8ca9, reversing
changes made to 464a55a4471f4ee171decc730858ab3ea815c98f.