Fixed #2

Please review changes