quick fixes 20141112
quick fixes #2 20141112