Few minor updates
Release/Demo version 8/12/2014