Changes: 20/01/2014 - 02

- Several bug fixes