Fixed more bugs related to the re-structuring
Merge pull request #44 from EnacheB/master

Fixed more bugs related to the re-structuring