Merge pull request #50 from Bjanski/Dev

Dev
This commit is contained in:
Jan Babor 2016-07-15 23:44:11 +02:00 committed by GitHub
commit 88a93cbcaa