Merge pull request #12 from pharpend/develop

bulk merge from pharpend:lysa