tmp update
prepare for merge inputie
prepare for bugfix11
fix bug #12
fix #12 #13