Merged pull request #185 from jkoncick/master + resolve conflicts