fixed bug 234
Merge origin/master

Conflicts:
	Demo1/src/demo1/Demo1.java
added s