Fixes #1

1st commit changes