Issue#9 formated

Fix for issue #9 - without formating issues ;)