Revert "v1,3 - 24/12/14, commit3"

This reverts commit 6a71ae43d206bf5a0ed2f24165c81537957d0287.