Changed the order of imports #76