20141121 - Fixed serialilzer issues