Merge branch 'master' of https://github.com/Telion/Simplua into dev
second commit
minor bugfixes
Merge branch 'dev'