Merge pull request #17 from Cadair/master

First draft for Dev and Future as well lc tweaks.
Fix merge related issues