Merge pull request from #183 from phracek/master + resolve conflicts