fix #558 #560

Merged
erwinvaneyk merged 1 commits from patch-1 into master 2013-12-16 05:43:07 +01:00