Initial commit of working project (needs update to last released
version)

Change-Id: Ia2ae4b65ab382939b00943c15af02f435ecdfb0c