[#17] Allow png and jpeg types
[#17 Added spec]