Master v 1.1 - 1.0 Bug Fix
merged with master