Merge pull request #73 from romoloman/master