Merge pull request #480 from wpreul/develop

Cleaning up this. use
Removing lout dependencies