Basic changes for Stretch 2014
Merge pull request #7 from czapo/master

Basic changes for Stretch 2014