Refactoring the dat file loading, made it more flexible
Throw an exception when the data file could not be loaded
Merge remote-tracking branch 'burzum/master'