#13 - Fixed null references caused by improving modularity
#13 - Merge errors