Merge pull request #86 from lukaslueg/master