Bug Fixes 20/09/14

A1-1 Bug Fixed