Merge pull request #56 from scaleconf/develop

Ready for ticket go live