Fixes #1 Added loader