Sprint edit
Merge pull request #24 from lukaw3d/master

Sprint edit