fixed #222 and changed indenting to 2