Merge pull request #147 from tihansen/master

#44 | #148 | #142 | #126 | #151