wasowski Merge pull request #1 from wasowski/dev