Dev

Might as well fix #1.
By the way, how did you put things back into master? the network looks weird, and I'm not sure how to align my fork's master on yours in the future.