Merge pull request #3 from adamjakab/dev-1

accepted