Bugfix 20130904

fixed #11 and #13