Non-square map. Closes #2

Changed Map @size to @width and @height