lindbrook Merge pull request #5 from lindbrook/dev