fixed bug 1111
new fix to bug 1111
Merge remote-tracking branch 'upstream/master'

Conflicts:
	NewFeature.txt
Merge pull request #17 from smurgolo/master

bug fixed 1111