Rebase/Merge @joellundell PR #144 w/ develop and fixes