merged devel to master
Merged devel.
Fixed problem with prompt.
Merged devel.