Merge pull request #16 from teeeg/master

closes issue #6 #15